New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Google Play Billing Library: Update from v5.2.1 to v7.0.0 #67

Open

kus04e4ek wants to merge 1 commit into godot-sdk-integrations:master from kus04e4ek:master

+15 −23

kus04e4ek commented Jun 12, 2024 •

edited

Loading

Fixes: Google requiring Google Play Billing Library version 6 or newer #65.
Partially supersedes: Update to handle Google version requirements #66.
Partially supersedes: Billing v 5.2.0 #52.

This PR only partially supersedes them, because it doesn't change Android SDK versions, gradle versions, etc. Also doesn't change already deprecated methods in version 5.

Don't have a Google Play dev account, so can't really test, can just confirm that it compiles and doesn't produce different results when using the iap demo project without Google Play Console (GodotGooglePlayBilling's only compatible with 4.0 versions and maybe some 4.1 versions, tested with 4.0.4).

With this PR docs need to be updated (change BillingFlowParams.ProrationMode to BillingFlowParams.SubscriptionUpdateParams.ReplacementMode).

This PR also makes price_change_acknowledged never emit, API changed a lot. These changes seem too big to test without Google Play Console, so if anyone wants to salvage this PR, feel free. Can be merged as is, of course after testing, if having price_change_acknowledged is not critical.


          Google Play Billing Library: Update from v5.2.1 to v7.0.0

kus04e4ek force-pushed the master branch from 9443871 to 9966100 Compare

June 13, 2024 12:44

chrisrabe approved these changes

View reviewed changes

ivanfemia commented Jul 8, 2024

"At least 1 approving review is required by reviewers with write access."
What is missing to have this in the official repo? Who should give the additional review?

timoschwarzer approved these changes

View reviewed changes

kyoz commented Jul 17, 2024

Tested on my production games, work fine. Please release it when possible. ❤️

owlnewworlds commented Jul 22, 2024

What's the state of the issue ? A lot of Godot Android devs are blocked / scared about that.
Thank you! <3

ivanfemia commented Jul 22, 2024

. This is not intended to override the official plugin but just a quick temporary solution.

I created a new fork in the meantime with all the fixes
You just need to build the project with your Godot libs version.

owlnewworlds commented Jul 22, 2024

. This is not intended to override the official plugin but just a quick temporary solution.

I created a new fork in the meantime with all the fixes You just need to build the project with your Godot libs version.

Thank you! Well I still have time to wait for the official lib to be fixed but I hope it will be ASAP :)

Collaborator

timoschwarzer commented Jul 23, 2024

Sorry people, I'm currently loaded with work so I don't have time to get to this in the next 2 weeks at least. I'll try to review, merge and release as soon as possible though. Hope you understand ❤️

kus04e4ek commented

View reviewed changes

...ing/src/main/java/org/godotengine/godot/plugin/googleplaybilling/GodotGooglePlayBilling.java

               		billingClient = BillingClient
               								.newBuilder(getActivity())
-              								.enablePendingPurchases()
+              								.enablePendingPurchases(pendingPurchasesParams)

Author

kus04e4ek Jul 23, 2024

enablePendingPurchases is deprecated: This method is equivalent to enablePendingPurchases(PendingPurchasesParams.newBuilder().enableOneTimeProducts().build())

...ing/src/main/java/org/godotengine/godot/plugin/googleplaybilling/GodotGooglePlayBilling.java

@@ @@ -63,7 +62,7 @@ @@
               import java.util.List;
               import java.util.Set;
-              public class GodotGooglePlayBilling extends GodotPlugin implements PurchasesUpdatedListener, BillingClientStateListener, PriceChangeConfirmationListener {

Author

kus04e4ek Jul 23, 2024

PriceChangeConfirmationListener is deprecated

...ing/src/main/java/org/godotengine/godot/plugin/googleplaybilling/GodotGooglePlayBilling.java

@@ @@ -216,14 +213,14 @@ public Dictionary confirmPriceChange(String sku) { @@
               	@UsedByGodot
               	public Dictionary purchase(String sku) {
               		return purchaseInternal("", sku,
-              			BillingFlowParams.ProrationMode.UNKNOWN_SUBSCRIPTION_UPGRADE_DOWNGRADE_POLICY);
+              			BillingFlowParams.SubscriptionUpdateParams.ReplacementMode.UNKNOWN_REPLACEMENT_MODE);

Author

kus04e4ek Jul 23, 2024

ProrationMode is deprecated: use SubscriptionUpdateParams.ReplacementMode instead

...ing/src/main/java/org/godotengine/godot/plugin/googleplaybilling/GodotGooglePlayBilling.java

Comment on lines +219 to +220

		public Dictionary updateSubscription(String oldToken, String sku, int replacementMode) {
		return purchaseInternal(oldToken, sku, replacementMode);

Author

kus04e4ek Jul 23, 2024

See the comment above

...ing/src/main/java/org/godotengine/godot/plugin/googleplaybilling/GodotGooglePlayBilling.java

               	}
-              	private Dictionary purchaseInternal(String oldToken, String sku, int prorationMode) {
+              	private Dictionary purchaseInternal(String oldToken, String sku, int replacementMode) {

Author

kus04e4ek Jul 23, 2024

See the comment above

...ing/src/main/java/org/godotengine/godot/plugin/googleplaybilling/GodotGooglePlayBilling.java

    
            @@ -241,11 +238,11 @@ private Dictionary purchaseInternal(String oldToken, String sku, int prorationMo
          
              		if (!obfuscatedProfileId.isEmpty()) {

              			purchaseParamsBuilder.setObfuscatedProfileId(obfuscatedProfileId);

              		}

              		if (!oldToken.isEmpty() && prorationMode != BillingFlowParams.ProrationMode.UNKNOWN_SUBSCRIPTION_UPGRADE_DOWNGRADE_POLICY) {

              		if (!oldToken.isEmpty() && replacementMode != BillingFlowParams.SubscriptionUpdateParams.ReplacementMode.UNKNOWN_REPLACEMENT_MODE) {

Author

kus04e4ek Jul 23, 2024

See the comment above

...ing/src/main/java/org/godotengine/godot/plugin/googleplaybilling/GodotGooglePlayBilling.java

Comment on lines -207 to -210

-              		PriceChangeFlowParams priceChangeFlowParams =
-              			PriceChangeFlowParams.newBuilder().setSkuDetails(skuDetails).build();
-              		billingClient.launchPriceChangeConfirmationFlow(getActivity(), priceChangeFlowParams, this);

Author

kus04e4ek Jul 23, 2024

PriceChangeFlowParams is deprecated

...ing/src/main/java/org/godotengine/godot/plugin/googleplaybilling/GodotGooglePlayBilling.java

               			BillingFlowParams.SubscriptionUpdateParams updateParams =
               				BillingFlowParams.SubscriptionUpdateParams.newBuilder()
-              					.setOldSkuPurchaseToken(oldToken)
-              					.setReplaceSkusProrationMode(prorationMode)
+              					.setOldPurchaseToken(oldToken)

Author

kus04e4ek Jul 23, 2024

From here: Removed BillingFlowParams.SubscriptionUpdateParams.Builder#setOldSkuPurchaseToken(). Developers should use BillingFlowParams.SubscriptionUpdateParams.Builder#setOldPurchaseToken(java.lang.String) instead.

...ing/src/main/java/org/godotengine/godot/plugin/googleplaybilling/GodotGooglePlayBilling.java

    
              					.setOldSkuPurchaseToken(oldToken)

              					.setReplaceSkusProrationMode(prorationMode)

              					.setOldPurchaseToken(oldToken)

              					.setSubscriptionReplacementMode(replacementMode)

Author

kus04e4ek Jul 23, 2024 •

edited

Loading

See this comment

...ing/src/main/java/org/godotengine/godot/plugin/googleplaybilling/GodotGooglePlayBilling.java

Comment on lines -283 to -286

-              	@Override
-              	public void onPriceChangeConfirmationResult(BillingResult billingResult) {
-              		emitSignal("price_change_acknowledged", billingResult.getResponseCode());
-              	}

Author

kus04e4ek Jul 23, 2024

onPriceChangeConfirmationResult is a method from PriceChangeConfirmationListener, which is deprecated

owlnewworlds commented Jul 23, 2024

Sorry people, I'm currently loaded with work so I don't have time to get to this in the next 2 weeks at least. I'll try to review, merge and release as soon as possible though. Hope you understand ❤️

Of course we understand! ^^ Limit date is August 31 if I understood correctly so you have time :)

kyoz mentioned this pull request

Google requiring Google Play Billing Library version 6 or newer #65

Open

MarcosFGS-CDS commented Aug 14, 2024

Hello, do we have any updates on this PR? 31 is getting closer every day, regardless any recommendation from the team about how to proceed for new projects until this is approved? thanks

owlnewworlds commented Aug 14, 2024

Hello, do we have any updates on this PR? 31 is getting closer every day, regardless any recommendation from the team about how to proceed for new projects until this is approved? thanks

Same here. Time flies 😅 and I don't want my future builds to be blocked by Google because of that.

MarcosFGS-CDS commented Aug 16, 2024

@timoschwarzer would you be able to provide an ETA for this to be reviewed and released?
If this is not possible
@kus04e4ek would you be able to provide some help on how to build your fork?
I keep getting gradle errors

Thank you in advance

Author

kus04e4ek commented Aug 19, 2024

Would you be able to provide some help on how to build your fork? I keep getting gradle errors

Are you getting General error during semantic analysis: Unsupported class file major version? Then you need to install 14th version of Java and set your JAVA_HOME variable

Collaborator

timoschwarzer commented Aug 19, 2024

@timoschwarzer would you be able to provide an ETA for this to be reviewed and released? If this is not possible @kus04e4ek would you be able to provide some help on how to build your fork? I keep getting gradle

@MarcosFGS-CDS I am not

Yolwoocle commented Sep 22, 2024 •

edited

Loading

Any plans to merge this soon? The 31st august deadline has passed and I'm planning to release a game using this library. The last release is from a year ago...

LMSSonos commented Oct 16, 2024 •

edited

Loading

. This is not intended to override the official plugin but just a quick temporary solution.

I created a new fork in the meantime with all the fixes You just need to build the project with your Godot libs version.

@ivanfemia thanks for the fork. works as expected, only problem I have is that after calling payment.acknowledgePurchase() I get the purchase_acknowledged and purchase_acknowledgement_error events fired with the same token. Any idea?

Edit: I think it was related to the payment.billing_resume which is used according the official documentation, if I remove that and use the purchases_updated only, then it works as expected.

Stoniye commented Dec 15, 2024

@ivanfemia how can i get the .aar file from your fork, which i paste in my project?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet